Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 08:31:45 +0000 (00:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 08:31:45 +0000 (00:31 -0800)

Trivial merge